Merge version 5.3.0-3+rpi1 and 5.4.0-1 to produce 5.4.0-1+rpi1

diff --cc .gitattributes
Simple merge

diff --cc configure.ac
Simple merge

diff --cc debian/changelog
index 6a777e89754fa79eaa40790f7289d85ecf34c375,d60f6cb6311179809992f3483b904c94b9f5da71..1eea1d51aa53e78cb58ace725c7469d98b686828
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,15 +1,29 @@@
- ocaml (5.3.0-3+rpi1) trixie-staging; urgency=medium
++ocaml (5.4.0-1+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 4.08.1-4+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 26 Nov 2019 19:38:59 +0000]
 +  * Revert previous raspbian changes, changing the triplet 
 +    now seems to cause more problems than it solves (specifically
 +    it causes ocaml to try and use nonexistant compilers).
 +  * Edit configure.ac to select armv6 when using "arm-linux-gnueabihf"
 +  * Partially fix clean target.
 +
 +  [changes introduced in 4.08.1-5+rpi1 by Peter Michael Green]
 +  * Remove gitattributes that cause problems for dgit.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 21 Jun 2025 00:00:16 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 13 Jan 2026 18:32:23 +0000
++
+ ocaml (5.4.0-1) unstable; urgency=medium
+ 
+   * New upstream release
+     - fma test from test suite fails on hppa, enable emulation like on
+       m68k
+     - mark test_compact_manydomains as multicore
+   * Build --without-zstd
+   * Switch debian/watch to version 5
+   * Bump Standards-Version to 4.7.2
+   * Remove Rules-Requires-Root
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Fri, 26 Dec 2025 12:48:51 +0100
  
  ocaml (5.3.0-3) unstable; urgency=medium
  

diff --cc debian/patches/series
index 1ed950efbe14480f2083e60cd8162c1b8ce7c409,73003fc9551e25c446bb9c8fb2010981bd04a61a..874715492aabc0a1ed9f6360ffb973e0b6d8d703
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,10 -1,5 +1,7 @@@
- 0001-Put-manpages-in-section-3o-instead-of-3.patch
- 0002-Trigger-output-complete-exe-on-custom-with-an-enviro.patch
- 0003-Do-not-error-on-warnings-in-autoconf.patch
- 0004-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch
- 0005-Check-for-definition-of-AT_SECURE-before-using-it.patch
- 0006-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch
- 0007-Enable-native-backend-and-dynlink-on-hurd-amd64.patch
- 0008-Mark-tests-that-actually-require-multicore.patch
+ Put-manpages-in-section-3o-instead-of-3.patch
+ Trigger-output-complete-exe-on-custom-with-an-enviro.patch
+ Do-not-error-on-warnings-in-autoconf.patch
+ Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch
+ Mark-test_compact_manydomains-as-multicore.patch
 +use-armv6-for-raspbian.patch
 +remove-gitattributes-that-cause-problems.patch

diff --cc debian/rules
Simple merge